bitkeeper revision 1.1663 (42a06245ee2G6mCs2baAK3_UiolIcQ)

Fix Linux for cpuset -> vcpumask rename.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
index 16b253866ff24c2ace63c4a4c88eddcab0eea354..641bca708d9e9220991ac40dcaa95988071246ba 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
@@ -112,7 +112,7 @@ void xen_tlb_flush_mask(cpumask_t *mask)
     if ( cpus_empty(*mask) )
         return;
     op.cmd = MMUEXT_TLB_FLUSH_MULTI;
-    op.cpuset = mask->bits;
+    op.vcpumask = mask->bits;
     BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
 
@@ -130,7 +130,7 @@ void xen_invlpg_mask(cpumask_t *mask, unsigned long ptr)
     if ( cpus_empty(*mask) )
         return;
     op.cmd = MMUEXT_INVLPG_MULTI;
-    op.cpuset = mask->bits;
+    op.vcpumask = mask->bits;
     op.linear_addr = ptr & PAGE_MASK;
     BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }

diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/hypervisor.c b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/hypervisor.c
index 83a922954cbcd971d2f5d7b56644e87cccd281c1..3923162df81882dcb56893c6352c3fef7461d5a8 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/hypervisor.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/hypervisor.c
@@ -122,7 +122,7 @@ void xen_tlb_flush_mask(cpumask_t *mask)
     if ( cpus_empty(*mask) )
         return;
     op.cmd = MMUEXT_TLB_FLUSH_MULTI;
-    op.cpuset = mask->bits;
+    op.vcpumask = mask->bits;
     BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
 
@@ -140,7 +140,7 @@ void xen_invlpg_mask(cpumask_t *mask, unsigned long ptr)
     if ( cpus_empty(*mask) )
         return;
     op.cmd = MMUEXT_INVLPG_MULTI;
-    op.cpuset = mask->bits;
+    op.vcpumask = mask->bits;
     op.linear_addr = ptr & PAGE_MASK;
     BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }